Merge "Snap for 12134224 from 065379926283b4d408f66c898ee559578c7ac0a0 to simpleperf-release" into simpleperf-release